hexiugang/iamberry-common-parent: iamberry-common-parent @ b9c85789ac703101b4c8c817816101027291cf99

liuzhiwei b9c85789ac Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent		7 gadi atpakaļ
..
AdminMachineController.java	308ff07bae 后台机器类机器列表	7 gadi atpakaļ
AdminProduceController.java	f732ad94cf 修改名称。	7 gadi atpakaļ
AdminPtsEmployeeController.java	f732ad94cf 修改名称。	7 gadi atpakaļ
EquipmentController.java	7018885b8a 增加空格	7 gadi atpakaļ
MachineController.java	e4584769d7 后台机器类机器列表	7 gadi atpakaļ
ProduceAppController.java	cdf09d7fb5 提出对接app的接口	7 gadi atpakaļ
PtsEmployeeAppController.java	cdf09d7fb5 提出对接app的接口	7 gadi atpakaļ