Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/TaMiniappController.java

      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taMiniapp",method= RequestMethod.GET)
+    @RequestMapping(value="/center/taMiniapp",method= RequestMethod.GET)
     public ResponseBean taMiniappList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
      * @param taMiniapp 实体对象
      * @return
      */
-    @RequestMapping(value="/taMiniapp",method= RequestMethod.POST)
+    @RequestMapping(value="/center/taMiniapp",method= RequestMethod.POST)
     public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp){
         ResponseBean responseBean = new ResponseBean();
         try {
      * @param taMiniapp 实体对象
      * @return
      */
-    @RequestMapping(value="/taMiniapp/{id}",method= RequestMethod.PUT)
-    public ResponseBean taMiniappUpdate(@PathVariable Integer id,
+    @RequestMapping(value="/center/taMiniapp/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMiniappUpdate(@PathVariable String id,
                                         @RequestBody TaMiniapp taMiniapp){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taMiniapp.setMiniappId(id);
             if (iTaMiniappService.updateById(taMiniapp)){
                 responseBean.addSuccess(taMiniapp);
             }else {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taMiniapp/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/center/taMiniapp/{id}",method= RequestMethod.GET)
     public ResponseBean taMiniappGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/controller/TaMiniappTemplateController.java

      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taMiniappTemplate",method= RequestMethod.GET)
-    public ResponseBean taMiniappTemplateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    @RequestMapping(value="/center/taMiniappTemplate/{miniAppId}",method= RequestMethod.GET)
+    public ResponseBean taMiniappTemplateList(@PathVariable String miniappId,
+                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaMiniappTemplate> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("miniapp_id",miniappId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaMiniappTemplate> result = iTaMiniappTemplateService.page(pg, queryWrapper);
      * @param taMiniappTemplate 实体对象
      * @return
      */
-    @RequestMapping(value="/taMiniappTemplate",method= RequestMethod.POST)
+    @RequestMapping(value="/center/taMiniappTemplate",method= RequestMethod.POST)
     public ResponseBean taMiniappTemplateAdd(@RequestBody TaMiniappTemplate taMiniappTemplate){
         ResponseBean responseBean = new ResponseBean();
         try {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taMiniappTemplate/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/center/taMiniappTemplate/{id}", method= RequestMethod.DELETE)
     public ResponseBean taMiniappTemplateDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
      * @param taMiniappTemplate 实体对象
      * @return
      */
-    @RequestMapping(value="/taMiniappTemplate/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/center/taMiniappTemplate/{id}",method= RequestMethod.PUT)
     public ResponseBean taMiniappTemplateUpdate(@PathVariable Integer id,
                                         @RequestBody TaMiniappTemplate taMiniappTemplate){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taMiniappTemplate.setSerialNo(id);
             if (iTaMiniappTemplateService.updateById(taMiniappTemplate)){
                 responseBean.addSuccess(taMiniappTemplate);
             }else {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taMiniappTemplate/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/center/taMiniappTemplate/{id}",method= RequestMethod.GET)
     public ResponseBean taMiniappTemplateGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/controller/TaOrgController.java

      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taOrg",method= RequestMethod.GET)
+    @RequestMapping(value="/center/taOrg",method= RequestMethod.GET)
     public ResponseBean taOrgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
      * @param taOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrg",method= RequestMethod.POST)
+    @RequestMapping(value="/center/taOrg",method= RequestMethod.POST)
     public ResponseBean taOrgAdd(@RequestBody TaOrg taOrg){
         ResponseBean responseBean = new ResponseBean();
         try {
                                         @RequestBody TaOrg taOrg){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taOrg.setOrgId(id);
             if (iTaOrgService.updateById(taOrg)){
                 responseBean.addSuccess(taOrg);
             }else {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taOrg/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/center/taOrg/{id}",method= RequestMethod.GET)
     public ResponseBean taOrgGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {